Comment fixes - Federico

diff --git a/gdk-pixbuf/gnome-canvas-pixbuf.c b/gdk-pixbuf/gnome-canvas-pixbuf.c
new file mode 100644 (file)
index 0000000..dd1a5f3
--- /dev/null
+++ b/gdk-pixbuf/gnome-canvas-pixbuf.c
@@ -0,0 +1,69 @@
+/* GNOME libraries - GdkPixbuf item for the GNOME canvas
+ *
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Author: Federico Mena-Quintero <federico@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include "gnome-canvas-pixbuf.h"
+
+\f
+
+static void gnome_canvas_pixbuf_class_init (GnomeCanvasPixbufClass *class);
+static void gnome_canvas_pixbuf_init (GnomeCanvasPixbuf *cpb);
+static void gnome_canvas_pixbuf_destroy (GtkObject *object);
+
+static GnomeCanvasItemClass *parent_class;
+
+\f
+
+/**
+ * gnome_canvas_pixbuf_get_type:
+ * @void: 
+ * 
+ * Registers the &GnomeCanvasPixbuf class if necessary, and returns the type ID
+ * associated to it.
+ * 
+ * Return value: The type ID of the &GnomeCanvasPixbuf class.
+ **/
+GtkType
+gnome_canvas_pixbuf_get_type (void)
+{
+       static GtkType canvas_pixbuf_type = 0;
+
+       if (!canvas_pixbuf_type) {
+               static const GtkTypeInfo canvas_pixbuf_info = {
+                       "GnomeCanvasPixbuf",
+                       sizeof (GnomeCanvasPixbuf),
+                       sizeof (GnomeCanvasPixbufClass),
+                       (GtkClassInitFunc) gnome_canvas_pixbuf_class_init,
+                       (GtkObjectInitFunc) gnome_canvas_pixbuf_init,
+                       NULL, /* reserved_1 */
+                       NULL, /* reserved_2 */
+                       (GtkClassInitFunc) NULL
+               };
+
+               canvas_pixbuf_type = gtk_type_unique (gnome_canvas_item_get_type (),
+                                                     &canvas_pixbuf_info);
+       }
+
+       return canvas_pixbuf_type;
+}
+
+/* Class initialization function for the pixbuf canvas item */

diff --git a/gdk-pixbuf/gnome-canvas-pixbuf.h b/gdk-pixbuf/gnome-canvas-pixbuf.h
new file mode 100644 (file)
index 0000000..d7f6009
--- /dev/null
+++ b/gdk-pixbuf/gnome-canvas-pixbuf.h
@@ -0,0 +1,64 @@
+/* GNOME libraries - GdkPixbuf item for the GNOME canvas
+ *
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Author: Federico Mena-Quintero <federico@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GNOME_CANVAS_PIXBUF_H
+#define GNOME_CANVAS_PIXBUF_H
+
+#include <libgnome/gnome-defs.h>
+#include <libgnomeui/gnome-canvas.h>
+
+BEGIN_GNOME_DECLS
+
+\f
+
+#define GNOME_TYPE_CANVAS_PIXBUF            (gnome_canvas_pixbuf_get_type ())
+#define GNOME_CANVAS_PIXBUF(obj)            (GTK_CHECK_CAST ((obj),            \
+                                            GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbuf))
+#define GNOME_CANVAS_PIXBUF_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),    \
+                                            GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufClass))
+#define GNOME_IS_CANVAS_PIXBUF(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CANVAS_PIXBUF))
+#define GNOME_IS_CANVAS_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),    \
+                                            GNOME_TYPE_CANVAS_PIXBUF))
+
+
+typedef struct _GnomeCanvasPixbuf GnomeCanvasPixbuf;
+typedef struct _GnomeCanvasPixbufClass GnomeCanvasPixbufClass;
+
+struct _GnomeCanvasPixbuf {
+       GnomeCanvasItem item;
+
+       /* Private data */
+       gpointer priv;
+};
+
+struct _GnomeCanvasPixbufClass {
+       GnomeCanvasItemClass parent_class;
+};
+
+
+GtkType gnome_canvas_pixbuf_get_type (void);
+
+\f
+
+END_GNOME_DECLS
+
+#endif

diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 75a31f6f167818abbb875ea69f01276e31f42fac..5b07a4feed39b86cf79930b598fccab06f4b9769 100644 (file)
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -103,11 +103,8 @@ image_load (FILE *f)
        /* ...and if we're interlaced... */
        passes = png_set_interlace_handling (png_ptr);
 
-       /* Update our info structs */
        png_read_update_info (png_ptr, info_ptr);
 
-       /* Allocate some memory and set up row array */
-       /* This "inhales vigorously"... */
        if (ctype & PNG_COLOR_MASK_ALPHA)
                bpp = 4;
        else